Renamed `merge' -> `my_merge' and `mergesort' -> `my_mergesort'.

1998-08-06  Martin Baulig  <martin@home-of-linux.org>

	* gtk/gtkclist.c: Renamed `merge' -> `my_merge' and
	`mergesort' -> `my_mergesort'.

diff --git a/ChangeLog b/ChangeLog
index 2fd2cdc64a355196e32d653f80b788a68987c089..29fc615901862ab4350ef7b8f113c3b70d8a5c50 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1998-08-06  Martin Baulig  <martin@home-of-linux.org>
+
+       * gtk/gtkclist.c: Renamed `merge' -> `my_merge' and
+       `mergesort' -> `my_mergesort'.
+
 Wed Aug  5 21:12:37 1998  Stefan Jeske  <stefan@gtk.org>
 
        * gtk/gtkenums.h: new enum GtkSortType.

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 2fd2cdc64a355196e32d653f80b788a68987c089..29fc615901862ab4350ef7b8f113c3b70d8a5c50 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+1998-08-06  Martin Baulig  <martin@home-of-linux.org>
+
+       * gtk/gtkclist.c: Renamed `merge' -> `my_merge' and
+       `mergesort' -> `my_mergesort'.
+
 Wed Aug  5 21:12:37 1998  Stefan Jeske  <stefan@gtk.org>
 
        * gtk/gtkenums.h: new enum GtkSortType.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 2fd2cdc64a355196e32d653f80b788a68987c089..29fc615901862ab4350ef7b8f113c3b70d8a5c50 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+1998-08-06  Martin Baulig  <martin@home-of-linux.org>
+
+       * gtk/gtkclist.c: Renamed `merge' -> `my_merge' and
+       `mergesort' -> `my_mergesort'.
+
 Wed Aug  5 21:12:37 1998  Stefan Jeske  <stefan@gtk.org>
 
        * gtk/gtkenums.h: new enum GtkSortType.

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 2fd2cdc64a355196e32d653f80b788a68987c089..29fc615901862ab4350ef7b8f113c3b70d8a5c50 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+1998-08-06  Martin Baulig  <martin@home-of-linux.org>
+
+       * gtk/gtkclist.c: Renamed `merge' -> `my_merge' and
+       `mergesort' -> `my_mergesort'.
+
 Wed Aug  5 21:12:37 1998  Stefan Jeske  <stefan@gtk.org>
 
        * gtk/gtkenums.h: new enum GtkSortType.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 2fd2cdc64a355196e32d653f80b788a68987c089..29fc615901862ab4350ef7b8f113c3b70d8a5c50 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+1998-08-06  Martin Baulig  <martin@home-of-linux.org>
+
+       * gtk/gtkclist.c: Renamed `merge' -> `my_merge' and
+       `mergesort' -> `my_mergesort'.
+
 Wed Aug  5 21:12:37 1998  Stefan Jeske  <stefan@gtk.org>
 
        * gtk/gtkenums.h: new enum GtkSortType.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 2fd2cdc64a355196e32d653f80b788a68987c089..29fc615901862ab4350ef7b8f113c3b70d8a5c50 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+1998-08-06  Martin Baulig  <martin@home-of-linux.org>
+
+       * gtk/gtkclist.c: Renamed `merge' -> `my_merge' and
+       `mergesort' -> `my_mergesort'.
+
 Wed Aug  5 21:12:37 1998  Stefan Jeske  <stefan@gtk.org>
 
        * gtk/gtkenums.h: new enum GtkSortType.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 2fd2cdc64a355196e32d653f80b788a68987c089..29fc615901862ab4350ef7b8f113c3b70d8a5c50 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+1998-08-06  Martin Baulig  <martin@home-of-linux.org>
+
+       * gtk/gtkclist.c: Renamed `merge' -> `my_merge' and
+       `mergesort' -> `my_mergesort'.
+
 Wed Aug  5 21:12:37 1998  Stefan Jeske  <stefan@gtk.org>
 
        * gtk/gtkenums.h: new enum GtkSortType.

diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c
index bf05c86d9ff2bbfbefdd537750b03a63e518940e..543425d2c11bd07ab9cfbb53db36a8d2427d1823 100644 (file)
--- a/gtk/gtkclist.c
+++ b/gtk/gtkclist.c
@@ -354,12 +354,12 @@ static void extend_selection (GtkCList      *clist,
 static gint default_compare (GtkCList     *clist,
                             gconstpointer row1,
                             gconstpointer row2);
-static GList * merge (GtkCList *clist,
-                     GList    *a,
-                     GList    *b);
-static GList * mergesort (GtkCList *clist,
-                         GList    *list,
-                         gint      num);
+static GList * my_merge (GtkCList *clist,
+                        GList    *a,
+                        GList    *b);
+static GList * my_mergesort (GtkCList *clist,
+                            GList    *list,
+                            gint      num);
 
 /* Fill in data after widget is realized and has style */
 
@@ -6063,9 +6063,9 @@ gtk_clist_set_sort_column (GtkCList *clist,
 }
 
 static GList *
-merge (GtkCList *clist,
-       GList    *a,         /* first list to merge */
-       GList    *b)         /* second list to merge */
+my_merge (GtkCList *clist,
+         GList    *a,         /* first list to merge */
+         GList    *b)         /* second list to merge */
 {
   GList z = { 0 };          /* auxiliary node */
   GList *c;
@@ -6117,9 +6117,9 @@ merge (GtkCList *clist,
 }
 
 static GList *
-mergesort (GtkCList *clist,
-          GList    *list,         /* the list to sort */
-          gint      num)          /* the list's length */
+my_mergesort (GtkCList *clist,
+             GList    *list,         /* the list to sort */
+             gint      num)          /* the list's length */
 {
   GList *half;
   gint i;
@@ -6140,9 +6140,9 @@ mergesort (GtkCList *clist,
       half->prev = NULL;
 
       /* recursively sort both lists */
-      return merge (clist,
-                   mergesort (clist, list, num / 2),
-                   mergesort (clist, half, num - num / 2));
+      return my_merge (clist,
+                      my_mergesort (clist, list, num / 2),
+                      my_mergesort (clist, half, num - num / 2));
     }
 }
 
@@ -6178,7 +6178,7 @@ gtk_clist_sort (GtkCList *clist)
       thaw = TRUE;
     }
 
-  clist->row_list = mergesort (clist, clist->row_list, clist->rows);
+  clist->row_list = my_mergesort (clist, clist->row_list, clist->rows);
 
   work = clist->selection;